Don't leak the iter of a running animation. (#151542)

Wed Sep  1 00:55:56 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkimage.c (gtk_image_clear): Don't leak the iter
	of a running animation.  (#151542)

diff --git a/ChangeLog b/ChangeLog
index ea1ad784619e6d41e1c72fee34cc90d29449313f..b40fded4037a248134c011c275043c026d39a9bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep  1 00:55:56 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkimage.c (gtk_image_clear): Don't leak the iter
+       of a running animation.  (#151542)
+
 Tue Aug 31 23:40:29 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gdk/win32/gdkproperty-win32.c (gdk_screen_get_setting): Make

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ea1ad784619e6d41e1c72fee34cc90d29449313f..b40fded4037a248134c011c275043c026d39a9bb 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Wed Sep  1 00:55:56 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkimage.c (gtk_image_clear): Don't leak the iter
+       of a running animation.  (#151542)
+
 Tue Aug 31 23:40:29 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gdk/win32/gdkproperty-win32.c (gdk_screen_get_setting): Make

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ea1ad784619e6d41e1c72fee34cc90d29449313f..b40fded4037a248134c011c275043c026d39a9bb 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Wed Sep  1 00:55:56 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkimage.c (gtk_image_clear): Don't leak the iter
+       of a running animation.  (#151542)
+
 Tue Aug 31 23:40:29 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gdk/win32/gdkproperty-win32.c (gdk_screen_get_setting): Make

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ea1ad784619e6d41e1c72fee34cc90d29449313f..b40fded4037a248134c011c275043c026d39a9bb 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Wed Sep  1 00:55:56 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkimage.c (gtk_image_clear): Don't leak the iter
+       of a running animation.  (#151542)
+
 Tue Aug 31 23:40:29 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gdk/win32/gdkproperty-win32.c (gdk_screen_get_setting): Make

diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index fc35c5c70eb4be52d627fee2dcd16a290c85d956..8d8b54ad3a104e95be5a81f5ede93ef7ce39ce5f 100644 (file)
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -1610,13 +1610,10 @@ gtk_image_clear (GtkImage *image)
       break;
 
     case GTK_IMAGE_ANIMATION:
-      if (image->data.anim.frame_timeout)
-        g_source_remove (image->data.anim.frame_timeout);
+      gtk_image_reset_anim_iter (image);
       
       if (image->data.anim.anim)
         g_object_unref (image->data.anim.anim);
-
-      image->data.anim.frame_timeout = 0;
       image->data.anim.anim = NULL;
       
       g_object_notify (G_OBJECT (image), "pixbuf_animation");